Remove dcmtk-www from the rules

diff --git a/debian/changelog b/debian/changelog
index d50f4638afdb3c502c910d60a7c395cb67a28a39..dd1f9437aef016ffda25be9c2bc7dd796e5d6cd6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
 dcmtk (3.6.1~20150924-1) UNRELEASED; urgency=medium
 
   * New upstream version 
-  * revert to old build system since cmake introducer too many problems 
-    for depenended packages 
   * move vcs to git
+  * Remove dcmtk-www, because it is no longer provided by upstream
 
  -- Gert Wollny <gw.fossdev@gmail.com>  Tue, 01 Dec 2015 02:46:03 +0100
 

diff --git a/debian/rules b/debian/rules
index e67126f11e353b1abac51a832602f13a6af7a091..c7c647b320034280966e27d470b520f134fd14bd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,6 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 # needed for the tests 
 export DCMDICTPATH=$(CURDIR)/dcmdata/data/dicom.dic
 
-
-
 # deduce documentation option (build-indep target)
 ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
   BUILDDOC = OFF
@@ -23,7 +21,6 @@ endif
 %:
        dh $@ --parallel --buildsystem=cmake
 
-# -DDCMTK_INSTALL_DATDIR:STRING=libdcmtk5
 
 # SKIP_RPATH=OFF to run test suite:
 # see #701231
@@ -41,7 +38,6 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk5 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF
 
-# -DCMAKE_INSTALL_PREFIX=/usr \
 
 override_dh_auto_configure:
        dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
@@ -59,22 +55,13 @@ override_dh_auto_build-indep:
 override_dh_auto_test-indep:
 
 
-override_dh_auto_test:
-       echo "DCMDICTDIR=$(DCMDICTPATH)"
-       dh_auto_test
-       echo "DCMDICTDIR=$(DCMDICTPATH)"
-
-
 override_dh_auto_install-arch:
        dh_auto_install
        # ??
        mv debian/tmp/usr/etc debian/tmp/
 
 override_dh_auto_install-indep:
-       #DESTDIR=debian/tmp $(MAKE) -C obj-*/doxygen install
        DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install 
-       #rm debian/dcmtk/usr/share/man/man1/_tmp_buildd*
-       #rm debian/tmp/usr/share/man/man1/_tmp_buildd*
        rm debian/tmp/usr/share/man/man1/_*.1
 
 override_dh_installdocs:
@@ -84,16 +71,10 @@ override_dh_installdocs:
 
 override_dh_install-arch:
        dh_install # --list-missing
-       chmod +x debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/*
        # wotsit ?
        rm ./debian/dcmtk/usr/bin/*_tests
        rm ./debian/dcmtk/usr/bin/drttest
        rm ./debian/dcmtk/usr/bin/mkreport
-       # fixup
-       mv ./debian/dcmtk/usr/bin/preplock debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/
-       mv ./debian/dcmtk/usr/bin/readoviw debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/
-       mv ./debian/dcmtk/usr/bin/readwlst debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/
-       mv ./debian/dcmtk/usr/bin/writwlst debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/
 
 override_dh_strip:
        dh_strip --dbg-package=libdcmtk5-dbg